]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
shell-gtk-embed: Fix NULL pointer dereference
authorJasper St. Pierre <jstpierre@mecheye.net>
Sun, 25 Mar 2012 10:07:15 +0000 (07:07 -0300)
committerJasper St. Pierre <jstpierre@mecheye.net>
Tue, 4 Sep 2012 22:21:30 +0000 (19:21 -0300)
Clutter will try to unmap during a dispose if we have a parent, so if we
set our own actor to NULL before the chain up, we're going to attempt to
unmap our own NULL actor. Fix that by swapping the order in which we
chain up.

https://bugzilla.gnome.org/show_bug.cgi?id=672790

src/shell-gtk-embed.c

index 8120e1eb2e711dc5ffd2d5bd36cfff6d179b3909..2232919c59d215b0e164f7d3bca07722caa8edc3 100644 (file)
@@ -223,9 +223,9 @@ shell_gtk_embed_dispose (GObject *object)
 {
   ShellGtkEmbed *embed = SHELL_GTK_EMBED (object);
 
-  shell_gtk_embed_set_window (embed, NULL);
-
   G_OBJECT_CLASS (shell_gtk_embed_parent_class)->dispose (object);
+
+  shell_gtk_embed_set_window (embed, NULL);
 }
 
 static void